print dialog: Fix layout preview drawing

Use the CSS name paper for this as well, and make sure Adwaita
sets a color that makes the text visible in the dark theme as well.

diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index fd917efc78083a3dfa82f9af6b6de686de4983ac..f47b9bcb57522a410a077d1cd7e78d6503e51d2c 100644 (file)
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -803,6 +803,7 @@ gtk_print_unix_dialog_init (GtkPrintUnixDialog *dialog)
   _gtk_print_load_custom_papers (priv->custom_paper_list);
 
   gtk_css_node_set_name (gtk_widget_get_css_node (priv->collate_image), I_("paper"));
+  gtk_css_node_set_name (gtk_widget_get_css_node (priv->page_layout_preview), I_("paper"));
 }
 
 static void

diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index af20b46217eb4056db5ef3aa4905bcbe721c46ca..d91e9eb5fa4caaca0ba63b8a48f640d67560a741 100644 (file)
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -2699,11 +2699,14 @@ levelbar {
 
 printdialog {
   paper {
+    color: $fg_color;
     border: 1px solid $borders_color;
     background: white;
     padding: 0;
 
-    &:backdrop { border-color: $backdrop_borders_color; }
+    &:backdrop { color: $backdrop_fg_color;
+                 border-color: $backdrop_borders_color;
+    }
   }
 
   .dialog-action-box {

diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index 7f1611e780bc6ca1d1668372f93241e22a8e746b..46af31358795157248e87736271d32e6f1a19851 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -3506,10 +3506,12 @@ levelbar {
  * Print dialog *
 *****************/
 printdialog paper {
+  color: #eeeeec;
   border: 1px solid #1c1f1f;
   background: white;
   padding: 0; }
   printdialog paper:backdrop {
+    color: #949796;
     border-color: #1f2222; }
 printdialog .dialog-action-box {
   margin: 12px; }

diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 53678f920817e468db03268aa259806c75608274..a7ff60d78f144318044b97dce81635a633b9c6a0 100644 (file)
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -3639,10 +3639,12 @@ levelbar {
  * Print dialog *
 *****************/
 printdialog paper {
+  color: #2e3436;
   border: 1px solid #9d9d99;
   background: white;
   padding: 0; }
   printdialog paper:backdrop {
+    color: #8b8e8f;
     border-color: #a5a5a1; }
 printdialog .dialog-action-box {
   margin: 12px; }